Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Sun, 10 Jan 2010 14:18:39 +0000 (22:18 +0800)
committerJason Rumney <jasonr@gnu.org>
Sun, 10 Jan 2010 14:18:39 +0000 (22:18 +0800)
commit1c72f59caf64e3d8a280fb2e47e5167582778528
treeddfc95dbdebaabec3deb2955c30ac431e8b4b1de
parent4fffb778525b583896b3da0864c4f8cf568c1fac
parent5c1aeaa16e15b5adf1aeb03c387f32a3de14646a
Merged from trunk